Always register the type with the type module, even if it had been

2006-05-05  Christian Persch  <chpe@cvs.gnome.org>

	* modules/printbackends/cups/gtkprintbackendcups.c:
	* modules/printbackends/lpr/gtkprintbackendlpr.c:
	* modules/printbackends/pdf/gtkprintbackendpdf.c: Always register
	  the type with the type module, even if it had been registered
	  before. Fixes bug #340676.

diff --git a/ChangeLog b/ChangeLog
index 8e080690019793d75af7eb0f73604757a39eda10..86e0cb3b5c76c2954e2bb72223fd5739ba81a4c1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-05-05  Christian Persch  <chpe@cvs.gnome.org>
+
+       * modules/printbackends/cups/gtkprintbackendcups.c:
+       * modules/printbackends/lpr/gtkprintbackendlpr.c:
+       * modules/printbackends/pdf/gtkprintbackendpdf.c: Always register
+         the type with the type module, even if it had been registered
+         before. Fixes bug #340676.
+
 2006-05-05  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkprintunixdialog.c: Use theme colors for 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8e080690019793d75af7eb0f73604757a39eda10..86e0cb3b5c76c2954e2bb72223fd5739ba81a4c1 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2006-05-05  Christian Persch  <chpe@cvs.gnome.org>
+
+       * modules/printbackends/cups/gtkprintbackendcups.c:
+       * modules/printbackends/lpr/gtkprintbackendlpr.c:
+       * modules/printbackends/pdf/gtkprintbackendpdf.c: Always register
+         the type with the type module, even if it had been registered
+         before. Fixes bug #340676.
+
 2006-05-05  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkprintunixdialog.c: Use theme colors for 

diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c
index 13bdfdb0d4168660d649776b4a07ff8a05e96320..81819300daa1c345c699c1d5e21203518960bb9c 100644 (file)
--- a/modules/printbackends/cups/gtkprintbackendcups.c
+++ b/modules/printbackends/cups/gtkprintbackendcups.c
@@ -158,26 +158,23 @@ static cairo_surface_t *    cups_printer_create_cairo_surface      (GtkPrinter
 static void
 gtk_print_backend_cups_register_type (GTypeModule *module)
 {
-  if (!print_backend_cups_type)
-    {
-      static const GTypeInfo print_backend_cups_info =
-      {
-       sizeof (GtkPrintBackendCupsClass),
-       NULL,           /* base_init */
-       NULL,           /* base_finalize */
-       (GClassInitFunc) gtk_print_backend_cups_class_init,
-       NULL,           /* class_finalize */
-       NULL,           /* class_data */
-       sizeof (GtkPrintBackendCups),
-       0,              /* n_preallocs */
-       (GInstanceInitFunc) gtk_print_backend_cups_init
-      };
-
-      print_backend_cups_type = g_type_module_register_type (module,
-                                                             GTK_TYPE_PRINT_BACKEND,
-                                                            "GtkPrintBackendCups",
-                                                            &print_backend_cups_info, 0);
-    }
+  static const GTypeInfo print_backend_cups_info =
+  {
+    sizeof (GtkPrintBackendCupsClass),
+    NULL,              /* base_init */
+    NULL,              /* base_finalize */
+    (GClassInitFunc) gtk_print_backend_cups_class_init,
+    NULL,              /* class_finalize */
+    NULL,              /* class_data */
+    sizeof (GtkPrintBackendCups),
+    0,         /* n_preallocs */
+    (GInstanceInitFunc) gtk_print_backend_cups_init
+  };
+
+  print_backend_cups_type = g_type_module_register_type (module,
+                                                         GTK_TYPE_PRINT_BACKEND,
+                                                         "GtkPrintBackendCups",
+                                                         &print_backend_cups_info, 0);
 }
 
 G_MODULE_EXPORT void 

diff --git a/modules/printbackends/lpr/gtkprintbackendlpr.c b/modules/printbackends/lpr/gtkprintbackendlpr.c
index daed2e589b9c39c0f1c159fbe5456e92bd246b2a..5bb8276626415677fb7694815e90f2b6de59235c 100644 (file)
--- a/modules/printbackends/lpr/gtkprintbackendlpr.c
+++ b/modules/printbackends/lpr/gtkprintbackendlpr.c
@@ -96,26 +96,23 @@ static void                 gtk_print_backend_lpr_print_stream    (GtkPrintBacke
 static void
 gtk_print_backend_lpr_register_type (GTypeModule *module)
 {
-  if (!print_backend_lpr_type)
-    {
-      static const GTypeInfo print_backend_lpr_info =
-      {
-       sizeof (GtkPrintBackendLprClass),
-       NULL,           /* base_init */
-       NULL,           /* base_finalize */
-       (GClassInitFunc) gtk_print_backend_lpr_class_init,
-       NULL,           /* class_finalize */
-       NULL,           /* class_data */
-       sizeof (GtkPrintBackendLpr),
-       0,              /* n_preallocs */
-       (GInstanceInitFunc) gtk_print_backend_lpr_init,
-      };
-
-      print_backend_lpr_type = g_type_module_register_type (module,
-                                                           GTK_TYPE_PRINT_BACKEND,
-                                                           "GtkPrintBackendLpr",
-                                                           &print_backend_lpr_info, 0);
-    }
+  static const GTypeInfo print_backend_lpr_info =
+  {
+    sizeof (GtkPrintBackendLprClass),
+    NULL,              /* base_init */
+    NULL,              /* base_finalize */
+    (GClassInitFunc) gtk_print_backend_lpr_class_init,
+    NULL,              /* class_finalize */
+    NULL,              /* class_data */
+    sizeof (GtkPrintBackendLpr),
+    0,         /* n_preallocs */
+    (GInstanceInitFunc) gtk_print_backend_lpr_init,
+  };
+
+  print_backend_lpr_type = g_type_module_register_type (module,
+                                                        GTK_TYPE_PRINT_BACKEND,
+                                                        "GtkPrintBackendLpr",
+                                                        &print_backend_lpr_info, 0);
 }
 
 G_MODULE_EXPORT void 

diff --git a/modules/printbackends/pdf/gtkprintbackendpdf.c b/modules/printbackends/pdf/gtkprintbackendpdf.c
index 206b2c1a8e8026470b3774b316fdbcd09fe25b27..746f1d270065b9756c1c08ba41aeae8e8ec36ed7 100644 (file)
--- a/modules/printbackends/pdf/gtkprintbackendpdf.c
+++ b/modules/printbackends/pdf/gtkprintbackendpdf.c
@@ -97,26 +97,23 @@ static cairo_surface_t *    pdf_printer_create_cairo_surface      (GtkPrinter
 static void
 gtk_print_backend_pdf_register_type (GTypeModule *module)
 {
-  if (!print_backend_pdf_type)
-    {
-      static const GTypeInfo print_backend_pdf_info =
-      {
-       sizeof (GtkPrintBackendPdfClass),
-       NULL,           /* base_init */
-       NULL,           /* base_finalize */
-       (GClassInitFunc) gtk_print_backend_pdf_class_init,
-       NULL,           /* class_finalize */
-       NULL,           /* class_data */
-       sizeof (GtkPrintBackendPdf),
-       0,              /* n_preallocs */
-       (GInstanceInitFunc) gtk_print_backend_pdf_init,
-      };
-
-      print_backend_pdf_type = g_type_module_register_type (module,
-                                                           GTK_TYPE_PRINT_BACKEND,
-                                                           "GtkPrintBackendPdf",
-                                                           &print_backend_pdf_info, 0);
-    }
+  static const GTypeInfo print_backend_pdf_info =
+  {
+    sizeof (GtkPrintBackendPdfClass),
+    NULL,              /* base_init */
+    NULL,              /* base_finalize */
+    (GClassInitFunc) gtk_print_backend_pdf_class_init,
+    NULL,              /* class_finalize */
+    NULL,              /* class_data */
+    sizeof (GtkPrintBackendPdf),
+    0,         /* n_preallocs */
+    (GInstanceInitFunc) gtk_print_backend_pdf_init,
+  };
+
+  print_backend_pdf_type = g_type_module_register_type (module,
+                                                        GTK_TYPE_PRINT_BACKEND,
+                                                        "GtkPrintBackendPdf",
+                                                        &print_backend_pdf_info, 0);
 }
 
 G_MODULE_EXPORT void